Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

remove solana-program from token-group-interface#7430

Merged
joncinque merged 3 commits into
solana-labs:masterfrom
kevinheavey:token-group-interface-rm-program
Oct 31, 2024
Merged

remove solana-program from token-group-interface#7430
joncinque merged 3 commits into
solana-labs:masterfrom
kevinheavey:token-group-interface-rm-program

Conversation

@kevinheavey

Copy link
Copy Markdown
Contributor

Updated imports and replace spl_program_error usage with inline impls

@mergify mergify Bot added the community Community contribution label Oct 31, 2024

@joncinque joncinque left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but let's finish the job!

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason that you didn't update the usage of solana_program at the top of this file?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope just missed it

Comment thread token-group/interface/Cargo.toml Outdated
solana-decode-error = "2.1.0"
solana-instruction = "2.1.0"
solana-msg = "2.1.0"
solana-program = "2.1.0"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks the only usage of solana-program can be removed from state.rs, see my other comment

@joncinque

Copy link
Copy Markdown
Contributor

CI error is being fixed in #7432

@joncinque joncinque merged commit 5d8e76d into solana-labs:master Oct 31, 2024
Comment on lines +10 to +11
#[repr(u32)]
#[derive(Clone, Debug, Eq, thiserror::Error, num_derive::FromPrimitive, PartialEq)]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just update the macro?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried, but that macro is quite tied to the assumption that there is a single solana_program crate that we import, and I didn't find a way to update it without breaking everything

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is my fault, remember #7112?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

community Community contribution

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants